3.4: Switch back to folks master, disable introspection in libgnomekbd

We're building libxklavier with no introspection, so we can't
enable it in libgnomekbd.

diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index 01d1f44144451eed204e5131edbe994eb8e844ee..bbdbc150f612487f1e287dee0a49174f8ecdf085 100644 (file)
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -510,7 +510,8 @@
                 "branch": "v.5.2",
                 "config-opts": ["--disable-introspection"]},
 
-               {"src": "gnome:libgnomekbd"},
+               {"src": "gnome:libgnomekbd",
+                "config-opts": ["--disable-introspection"]},
 
                {"src": "fd-pulse:pulseaudio",
                 "branch": "v0.9.23",
@@ -654,7 +655,6 @@
                 "config-opts": ["--enable-eds-backend",
                                 "--disable-Werror",
                                 "--disable-fatal-warnings"],
-                "branch": "wip/vala-0-15",
                 "patches": ["folks-builddir.patch",
                             "folks-config-fatal-warnings.patch"]},